Skip to content

Conversation

zeripath
Copy link
Contributor

If a deleted-branch has already been restored, a request to restore it again will cause a NPE. This PR adds detection for this case, but also disables buttons when they're clicked in order to help prevent accidental repeat requests.

Fix #21930

Signed-off-by: Andrew Thornton [email protected]

If a deleted-branch has already been restored, a request to restore it
again will cause a NPE. This PR adds detection for this case, but also
disables buttons when they're clicked in order to help prevent accidental repeat requests.

Fix go-gitea#21930

Signed-off-by: Andrew Thornton <[email protected]>
@zeripath zeripath added type/bug outdated/backport/v1.18 This PR should be backported to Gitea 1.18 labels Nov 25, 2022
@zeripath zeripath added this to the 1.19.0 milestone Nov 25, 2022
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Nov 25, 2022
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Nov 25, 2022
@zeripath
Copy link
Contributor Author

make lgtm work

@zeripath zeripath merged commit d7f12af into go-gitea:main Nov 25, 2022
@zeripath zeripath deleted the fix-21930-no-double-restore-branch branch November 25, 2022 20:58
zeripath added a commit to zeripath/gitea that referenced this pull request Nov 25, 2022
…o-gitea#21940)

Backport go-gitea#21940

If a deleted-branch has already been restored, a request to restore it
again will cause a NPE. This PR adds detection for this case, but also
disables buttons when they're clicked in order to help prevent
accidental repeat requests.

Fix go-gitea#21930

Signed-off-by: Andrew Thornton <[email protected]>
@zeripath zeripath added the backport/done All backports for this PR have been created label Nov 25, 2022
jolheiser pushed a commit that referenced this pull request Nov 25, 2022
…21940) (#21944)

Backport #21940

If a deleted-branch has already been restored, a request to restore it
again will cause a NPE. This PR adds detection for this case, but also
disables buttons when they're clicked in order to help prevent
accidental repeat requests.

Fix #21930

Signed-off-by: Andrew Thornton <[email protected]>
zjjhot added a commit to zjjhot/gitea that referenced this pull request Nov 29, 2022
* giteaofficial/main:
  Use random bytes to generate access token (go-gitea#21959)
  Replace fmt.Sprintf with hex.EncodeToString (go-gitea#21960)
  Implement FSFE REUSE for golang files (go-gitea#21840)
  Correct the fallbacks for mailer configuration (go-gitea#21945)
  [skip ci] Updated licenses and gitignores
  Fix typos (go-gitea#21947)
  Fix markdown anchor re-clicking (go-gitea#21931)
  Prevent NPE if trying to restore an already restored deleted branch (go-gitea#21940)
  add rel="me" to org.website link (go-gitea#21941)
@go-gitea go-gitea locked and limited conversation to collaborators May 3, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. outdated/backport/v1.18 This PR should be backported to Gitea 1.18 type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Panic in RestoreBranchPost if click restore branch muiltple time in one branch
5 participants